bitkeeper revision 1.1159.212.131 (4208dea93kRwptTEZzh2Dm2aH9dAKA)

merge

diff --cc xen/common/keyhandler.c
index 1b9527aa896bbf74572393544683f0e18bfd4a74,dad82476d0d46a6f8918869d6166f0b903fe1730..789b2d3c6aca4114d94f57299418e730007f6d66
--- 1/xen/common/keyhandler.c
--- 2/xen/common/keyhandler.c
+++ b/xen/common/keyhandler.c
@@@ -94,10 -93,9 +94,10 @@@ static void halt_machine(unsigned char 
      machine_restart(NULL); 
  }
  
- void do_task_queues(unsigned char key)
+ static void do_task_queues(unsigned char key)
  {
      struct domain *d;
 +    struct exec_domain *ed;
      s_time_t       now = NOW();
  
      printk("'%c' pressed -> dumping task queues (now=0x%X:%08X)\n", key,

diff --cc xen/common/physdev.c
Simple merge

diff --cc xen/common/resource.c
Simple merge

diff --cc xen/common/sched_bvt.c
index fb555781f1af812a01e6b3ba61acc978553432df,edad59ca1828c3a3af2fc3bea7d9586408ed7f0a..3a5449a13f56ad1276ee38337e011908aaa46bbc
--- 1/xen/common/sched_bvt.c
--- 2/xen/common/sched_bvt.c
+++ b/xen/common/sched_bvt.c
@@@ -167,27 -159,20 +167,27 @@@ static inline u32 calc_evt(struct exec_
   *
   * Returns non-zero on failure.
   */
- int bvt_alloc_task(struct exec_domain *ed)
 -static int bvt_alloc_task(struct domain *d)
++static int bvt_alloc_task(struct exec_domain *ed)
  {
 -    if ( (d->sched_priv = xmem_cache_alloc(dom_info_cache)) == NULL )
 -        return -1;
 -    memset(d->sched_priv, 0, sizeof(struct bvt_dom_info));
 +    struct domain *d = ed->domain;
 +    if ( (d->sched_priv == NULL) ) {
 +        if ( (d->sched_priv = xmalloc(struct bvt_dom_info)) == NULL )
 +            return -1;
 +        memset(d->sched_priv, 0, sizeof(struct bvt_dom_info));
 +    }
 +    ed->ed_sched_priv = &BVT_INFO(d)->ed_inf[ed->eid];
 +    BVT_INFO(d)->ed_inf[ed->eid].inf = BVT_INFO(d);
 +    BVT_INFO(d)->ed_inf[ed->eid].exec_domain = ed;
      return 0;
  }
  
  /*
   * Add and remove a domain
   */
- void bvt_add_task(struct exec_domain *d) 
 -static void bvt_add_task(struct domain *d) 
++static void bvt_add_task(struct exec_domain *d) 
  {
 -    struct bvt_dom_info *inf = BVT_INFO(d);
 +    struct bvt_dom_info *inf = BVT_INFO(d->domain);
 +    struct bvt_edom_info *einf = EBVT_INFO(d);
      ASSERT(inf != NULL);
      ASSERT(d   != NULL);
  
@@@ -225,7 -206,7 +225,7 @@@
      }
  }
  
- int bvt_init_idle_task(struct exec_domain *p)
 -static int bvt_init_idle_task(struct domain *p)
++static int bvt_init_idle_task(struct exec_domain *p)
  {
      if ( bvt_alloc_task(p) < 0 )
          return -1;
@@@ -239,10 -220,10 +239,10 @@@
      return 0;
  }
  
- void bvt_wake(struct exec_domain *d)
 -static void bvt_wake(struct domain *d)
++static void bvt_wake(struct exec_domain *d)
  {
 -    struct bvt_dom_info *inf = BVT_INFO(d);
 -    struct domain       *curr;
 +    struct bvt_edom_info *einf = EBVT_INFO(d);
 +    struct exec_domain  *curr;
      s_time_t            now, r_time;
      int                 cpu = d->processor;
      u32                 curr_evt;
@@@ -290,10 -271,10 +290,10 @@@ static void bvt_sleep(struct exec_domai
   * bvt_free_task - free BVT private structures for a task
   * @d:             task
   */
- void bvt_free_task(struct domain *d)
+ static void bvt_free_task(struct domain *d)
  {
      ASSERT(d->sched_priv != NULL);
 -    xmem_cache_free(dom_info_cache, d->sched_priv);
 +    xfree(d->sched_priv);
  }
  
  /* Control the scheduler. */